Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 12 Jul 2010 22:43:26 +0000 (22:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 12 Jul 2010 22:43:26 +0000 (22:43 +0000)
commit0969ee706164257d746ab503c62d5b903ca55bfb
treeda434abcc5f0849296707d4de12f50be2c6b9b7c
parent3c500a54c82b2512f6490250474f10ed07d233e4
parent665a155fb51fd25a80fa8c563ecddc338a693739
Merge from mainline.